Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 31 May 2010 11:48:23 +0000 (11:48 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 31 May 2010 11:48:23 +0000 (11:48 +0000)

Trivial merge